[VMXASSIST] Some reports that macros do not get picked up by CPP

if they are prefixed with $. Fix by placing macro uses in ().
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/firmware/vmxassist/head.S b/tools/firmware/vmxassist/head.S
index b183fac54eab2cb5f2479a26bc13410588b3f877..a4cb614c68bcd9f92032fb1a672b04967d8a82b2 100644 (file)
--- a/tools/firmware/vmxassist/head.S
+++ b/tools/firmware/vmxassist/head.S
@@ -59,7 +59,7 @@ _start16:
 
         /* go to protected mode */
         movl    %cr0, %eax
-        orl     $CR0_PE, %eax
+        orl     $(CR0_PE), %eax
         movl    %eax, %cr0
         data32  ljmp $0x08, $1f
 

diff --git a/tools/firmware/vmxassist/trap.S b/tools/firmware/vmxassist/trap.S
index 468da0a5db5125d020579c1c70560abfaf572015..30e87adb85665ea1a9466a45c3a3ed8ef0e4efd0 100644 (file)
--- a/tools/firmware/vmxassist/trap.S
+++ b/tools/firmware/vmxassist/trap.S
@@ -106,7 +106,7 @@ common_trap:                                /* common trap handler */
        pushl   %es
        pushal
 
-       movl    $DATA_SELECTOR, %eax    /* make sure these are sane */
+       movl    $(DATA_SELECTOR), %eax  /* make sure these are sane */
        movl    %eax, %ds
        movl    %eax, %es
        movl    %eax, %fs